OSX build fixes
authorJoey Hess <joeyh@joeyh.name>
Mon, 17 Feb 2025 18:04:08 +0000 (14:04 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 17 Feb 2025 18:04:08 +0000 (14:04 -0400)
Assistant/Install.hs
Assistant/Threads/Watcher.hs

index c1827ae541fe31148864aca8e83930c3caf0f6b2..750b4a9adc1981a9d467c3605bec6f52093bedc4 100644 (file)
@@ -61,7 +61,7 @@ ensureInstalled = ifM (isJust <$> getEnv "GIT_ANNEX_PACKAGE_INSTALL")
 
 #ifdef darwin_HOST_OS
                autostartfile <- userAutoStart osxAutoStartLabel
-               installAutoStart program autostartfile
+               installAutoStart (fromOsPath program) autostartfile
 #else
                ifM osAndroid
                        ( do
index 1e38195cfec540cd949b8009e13a2fc29aed1b42..33b63be694f8a6317d14c56c3bab2bc924f6c2ef 100644 (file)
@@ -165,7 +165,7 @@ ignored = ig . takeFileName
                | f == literalOsPath ".gitignore" = True
                | f == literalOsPath ".gitattributes" = True
 #ifdef darwin_HOST_OS
-               | f == literlosPath ".DS_Store" = True
+               | f == literalOsPath ".DS_Store" = True
 #endif
                | otherwise = False